From 37c87ccde423742345de060b3bf4a3f69f91200a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 4 Nov 2001 23:43:37 +0000 Subject: [PATCH] queue_resize_on_group with both the old and new mode, not just the new Sun Nov 4 18:39:43 2001 Owen Taylor * gtk/gtksizegroup.c (gtk_size_group_set_mode): queue_resize_on_group with both the old and new mode, not just the new mode. (#60171, Nicolas Setton). Also, notify the "mode" property. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtksizegroup.c | 7 ++++++- 8 files changed, 55 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 620483d825..5d4d220821 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 620483d825..5d4d220821 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 620483d825..5d4d220821 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 620483d825..5d4d220821 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 620483d825..5d4d220821 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 620483d825..5d4d220821 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 620483d825..5d4d220821 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Nov 4 18:39:43 2001 Owen Taylor + + * gtk/gtksizegroup.c (gtk_size_group_set_mode): + queue_resize_on_group with both the old and new mode, not + just the new mode. (#60171, Nicolas Setton). Also, notify + the "mode" property. + Sun Nov 4 16:02:08 2001 Owen Taylor * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse() diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 2ceca3c4d8..e0f28b020a 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -358,8 +358,13 @@ gtk_size_group_set_mode (GtkSizeGroup *size_group, if (size_group->mode != mode) { + if (size_group->mode != GTK_SIZE_GROUP_NONE) + queue_resize_on_group (size_group); size_group->mode = mode; - queue_resize_on_group (size_group); + if (size_group->mode != GTK_SIZE_GROUP_NONE) + queue_resize_on_group (size_group); + + g_object_notify (G_OBJECT (size_group), "mode"); } } -- 2.30.2